* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially

after `=>'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 279ce22a4379c9e2c4f01bd657cfbd9d64176198..03353e1e86bedd6fe24db684d01b87c8527c3364 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
+       after `=>' (bug#16811).
+
 2014-02-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * elec-pair.el (electric-pair-text-syntax-table)

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e2175fcc80b6d3be191d8337c48a3a5ab769696a..709bc67451d80a10406cd9d500d219281c567049 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -653,7 +653,6 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
      (if (smie-rule-sibling-p)
          (and ruby-align-chained-calls 0)
        ruby-indent-level))
-    (`(:after . "=>") ruby-indent-level)
     (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure"))
      (smie-rule-parent))
     (`(:before . "when")

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index cf6bcba8c393a88e70b02e8aef4892dcb6c0a998..5fd59bfb186a3b49be1f896cb9bc090119ce6313 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -361,4 +361,10 @@ foo(bar:
       tee)
 
 foo(:bar =>
-      tee)
+    tee)
+
+{'a' => {
+   'b' => 'c',
+   'd' => %w(e f)
+ }
+}